Merge changes from topic "cuj-sysui-launches" into sc-dev am: b538b60e am:...

Merge changes from topic "cuj-sysui-launches" into sc-dev am: b538b60e am: 8b164133 am: f71c4ac3

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

Change-Id: I9ac7614b2878b4229660de2555e5922e68e430bd