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

Change-Id: Iec015c0607286511a0d82db7fd6c82f6e17379aa