Merge changes from topic "cuj-sysui-launches" into sc-dev am: b538b60ea6 am: 60d0b1f474
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14965045 Change-Id: I5e55bfe40df71a6fe56aedea397438a6768171f7
This commit is contained in: