Merge "Package whitelist for hiddenapi checks." am: 9a50d75795 am: 3d2a3e25d3
am: 60b6925bdb  -s ours

Change-Id: Icc96c28fd9289268398c71f82ac83038a606550d