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: I9ac1d16b7b03ceb43c0584c60d3978a214c28666