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

am skip reason: subject contains skip directive

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

Change-Id: Iee0696a8b77a8b4c12976d08fdf473f7cd4f1b82