[automerger skipped] Clean up use of hidden APIs am: 4a2ff26de6 am: 11a4e13c0c
am: 7d5439d9e5 -s ours
am skip reason: change_id Iabf338fbf9213bcf69cac491ebe13e3437f98f04 with SHA1 8d7d0a10ca is in history

Change-Id: I7cdf30bfb9ed6dc8998052d9bc3b3a307a86dfe0