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

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

Change-Id: I60a9093912f0adfc7c3876c56201c827ef4746b7