Merge changes from topic "am-bda2d9dc20054c69842a76df0eeffc2d" into sc-v2-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Fixing unsafe pending intent in notification" into qt-dev am: bfc095df am: ec3f123b -s ours am: 9bf0157d -s ours am: 95fbe3a3 -s ours am: b8ec3622 -s ours am: 3235c7d0 -s ours am: f6a2f448 -s ours
  [automerger skipped] [DO NOT MERGE] Fixing unsafe pending intent in notification am: 7ff5163b -s ours am: c3ccdd5a -s ours am: 9b98f15f -s ours am: adfd9cea -s ours am: d6d0192b -s ours am: 0b8cca4f -s ours am: b97c0b97 -s ours