Merge "Controls UI - Marquee + transient status == no good" into rvc-dev am: a2e3ae13 am: cb647e61

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

Change-Id: I614e0fd24c047292b89e051bf2d95fe808f7dca2