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

Change-Id: I3b60975955eef314920c9c548edb93a9c3e56b10