[automerger skipped] Merge "[DO NOT MERGE] Update controls icon" into sc-dev...

[automerger skipped] Merge "[DO NOT MERGE] Update controls icon" into sc-dev am: e81cce70 am: 49667d62 -s ours am: 13e4034e -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377011

Change-Id: Ic55e78909376e35a6dee0b9f558188a86c861aff