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

Change-Id: Ia79a2af778047f34bd7ff24d56dcbadfff61d384