[automerger skipped] Merge "Removal of usage of hidden APIs" am: f6ab107105 am: 604694740f am: a472788592
am: 4c8ba1f16b -s ours
am skip reason: change_id I5bd96a47af65b99b8ce58064138634b889ea49a9 with SHA1 869d0f6730 is in history

Change-Id: I9925103cd05acb6ec1c78dc0f3763c917ab7f5c7