Merge "Merge "Add known uses to hidden API light greylist" into pi-dev am: 9aefc4fce0" into pi-dev-plus-aosp
am: 8c8b673e50

Change-Id: If60dd624df070874fbd17740f9590a7ea85b5333