Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc
am: 83b46a1590

Change-Id: Ib859c8848a05004a5de36aaf67b4dd3ac72899e9