Merge "Disable hidden API checks for WellKnownClasses" am: 7801e154c4
am: a37afd6453

Change-Id: I6c3d596ed5e3845369a024c76d91b931026fea62