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

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

Change-Id: I26803319f43b8d88ac4511e65f622871f80dc431