[automerger skipped] DO NOT MERGE Make intents immutable am: dba9823ac7 am: 51ed0f97df am: e0862c053d -s ours am: 5b227475ab -s ours am: c2407e7e8c am: 37ba307e1f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6806166a009e9ba43368aa7a34174a61f8353e3e