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