Merge "Temporarily whitelist platform test packages for hidden API" into pi-dev
am: bd632c3960

Change-Id: I111909393320da09f2f423803b8986418bbbede6