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

Change-Id: I3faf2edd44199609a5c412cd7430140e254d90c8