Merge "Controls UI - Use custom icon for favoriting" into rvc-dev am: c472565d am: 19df2018 am: e095dd95 am: efe1e389

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

Change-Id: I6a53018f7bd6b74983d5ed17e145c943dd5801dc