Merge changes from topic "am-dfb2548770de4bb299490c765377bd11" into pi-dev-plus-aosp

* changes:
  Merge changes Id81271ff,I8f298371 am: e7372ab0d5 am: e770b16975
  [automerger skipped] DO NOT MERGE ANYWHERE Update hiddenapi-p-light-greylist.txt am: 85c81cb24c  -s ours am: 6041de0722  -s ours