Merge "Merge "Log an event on hidden API accesses." into pi-dev am: ba4f1a253e" into pi-dev-plus-aosp