[automerger skipped] Merge "Add more hidden APIs to light greylist" into pi-dev am: 6021921b94
am: 4720a41e0b  -s ours

Change-Id: Id811b388ce4f858bb250e1c62c667e48fcac80d2