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

Change-Id: I95c824b6107083667be474c4fc1f8d3bbd22648e