Merge "Enable hidden API enforcement"
am: cf026fec63

Change-Id: I069f33209f2bfc9dabdbb16a23d600afa9d9798a