[automerger skipped] Merge "[DO NOT MERGE] Update controls icon" into sc-dev am: e81cce70ac -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377011 Change-Id: Ibd4c5bf17cd3c2db3607b6bcd3e5b4a92228e185
This commit is contained in: