[automerger skipped] [DO NOT MERGE] Update controls icon am: e8625d279f am: 95cfd1ba8e -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15377011 Change-Id: I78ed13c1d47c6d1ebbde955ecc01860b46dabd24
This commit is contained in: