Merge "Revert "Enable hidden API blacklist"" into pi-dev
am: 90ad15400a

Change-Id: I1d2b05e6959538b5b60a63f76fcd10b42b8e83a5