Merge "Enable hidden API enforcement" am: cf026fec63
am: 845a73534d

Change-Id: If0dcdbce72957add4ebbe72c3fb1c6682b68bad9