[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 skip reason: Change-Id I56f21b2ef351a4fc57335c0943f488f6e952b17d with SHA-1 a9b9afe1 is in history
Change-Id: Ic7a0c3fdd32f28ef26da24f2ceac3fc107795a11