[automerger skipped] [DO NOT MERGE] Update controls icon am: e8625d27 am:...

[automerger skipped] [DO NOT MERGE] Update controls icon am: e8625d27 am: 95cfd1ba -s ours am: f8976108 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I81a9b6878a91d4a46bcd8c5f6eac0130eb7c654f