[automerger skipped] Merge "Removal of usage of hidden APIs" am: 78b20d0d58 am: e8eefec918 am: c162389c31
am: 01b3d3bb8e -s ours
am skip reason: change_id If8011bbe6af32c038f55d851acc2406eba208de6 with SHA1 856102468d is in history

Change-Id: Ie77829dcc65603696277ef1cd80e4740173b1392