[automerger skipped] Merge "[DO NOT MERGE] Update controls icon" into sc-dev am: e81cce70 -s ours am: e93f3f48 -s ours am: 341e3874 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I522d8a3c75dc0d96dfd485b9cd00883e13d51451