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