Merge "Remove public API methods from hiddenapi-light-greylist.txt" am: 88994b26cc
am: 61f6dc4c24

Change-Id: I7575e9818e9f67258b839fe251987d0a34cb046f