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

Change-Id: I428a04c66a28541c9609d572da7792df1eb3c130