Merge "Fix shell-transit to legacy app-cancel metrics" into sc-v2-dev am: bfe16934 am: 23e4f9d4

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

Change-Id: I2f3609077e7b2dbcf79975c66e5036322624d6f1