Merge "Package whitelist for hiddenapi checks." am: 9a50d75795
am: 3d2a3e25d3

Change-Id: I8e0120c77965a3d5784e61c7eabe5a8c4f88b1ea