Merge "Revert "Disable hidden API checks during WellKnownClasses::Init"" am: 272bbb0959 am: 94668bc915
am: 0b8e97983c

Change-Id: Ie69a84aca7af73660a02d7c79c40220aa6fe9395