Merge "Whitelisting Launcher3 for hidden APIs" into pi-dev am: 87c24a655b
am: 5e7e1cd2e5

Change-Id: Ic16dcba34d9e97d5a1dc3c9a0dcf474c64b48743