Merge "Add more uses of hidden APIs into light greylist" into pi-dev am: 916800d82c
am: 147f67b3e7

Change-Id: I2fd217edf539dbdeefc4fbc61ec6562a4466bb93