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

Change-Id: I727c4f15ee448458b4ce0dca19dfa6ef89be4d71