[automerger skipped] Merge "Configurable hidden API exemptions." into pi-dev
am: fe930f2023  -s ours

Change-Id: Ib56faa6cc756d87b8c8654dbf0b1655d310e6d38