Merge "Disable hidden API checks during WellKnownClasses::Init" am: 9b9458ae0b
am: 03a9f4bfc8

Change-Id: Ib383858d90ad81721cc8d4cf86eab91ce5c43059