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

Change-Id: I0205706d025ea0609c22fec008ea1c954a618f63