[automerger skipped] Merge "Remove some usages of @hide variables or APIs."...

[automerger skipped] Merge "Remove some usages of @hide variables or APIs." am: 9b1ce9c7 am: fa00e27d -s ours am: add08418 -s ours am: 19d4ec75 -s ours am: 8e89cde6 -s ours

am skip reason: Change-Id I56f21b2ef351a4fc57335c0943f488f6e952b17d with SHA-1 a9b9afe1 is in history

Change-Id: I820ca18209b8a5184938291aa59e7320dd40d1fa