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

Change-Id: I1a30989e0fd2ced4a7e298ae26e76f3525c03362