[automerger skipped] Merge changes from topic "widget_launch_cookie-sc-v2-dev"...

[automerger skipped] Merge changes from topic "widget_launch_cookie-sc-v2-dev" into sc-v2-dev-plus-aosp am: 95554e89 -s ours am: ba319a8c -s ours am: 375b10d4 -s ours

am skip reason: Merged-In I339ea827836fa53ab5bb1617a72f9e0e5ae0f5ec with SHA-1 ad594686 is already in history

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

Change-Id: Ie1062c42190c6ad9a0684cc309ba24909b6853f1