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

Change-Id: I287155848f739794c5fc7689df8ff60b7a0fd583