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

am skip reason: subject contains skip directive

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

Change-Id: Ie9ee643cc8517c27a8073be7180af8f5d8f8f3a4