[automerger skipped] Merge changes from topic "pendingIntent-switchToSub" am:...

[automerger skipped] Merge changes from topic "pendingIntent-switchToSub" am: 49f79010 am: 143ed3c3 am: e15e9162 -s ours am: 9346167f -s ours

am skip reason: Merged-In Ieec385ee6b054d2c6392c4a45eb501eb876cdd0a with SHA-1 805e7d12 is already in history

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



Change-Id: Ic4b0e8a3c8682a2755338095220148238512580e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>