Merge "Publish hidden API light greylist from P" am: 0835de9e17
am: c9993a2bb5

Change-Id: I8d77ed6ecb4004b70c0b6f97407604aa427c2151