[automerger skipped] Merge "IMMS: Make IMMS PendingIntents immutable" into...

[automerger skipped] Merge "IMMS: Make IMMS PendingIntents immutable" into qt-dev am: 5ccf55eb am: 6c68f501 am: 02bf6459 -s ours am: 7b372e88 -s ours

am skip reason: Merged-In I34a95732ef3e7c20d6549b57230c11f0c3db04d6 with SHA-1 6842f03c is already in history

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



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