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