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