[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: a8b12410 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iedfd7eac91e65c4a061da01986a7b60a48808140