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

Change-Id: I950358108a9df60418e9d1370f55fdc81a2046f5