[automerger skipped] DO NOT MERGE Make intents immutable am: dba9823a am:...

[automerger skipped] DO NOT MERGE Make intents immutable am: dba9823a am: 51ed0f97 am: e0862c05 -s ours am: 5b227475 -s ours am: c2407e7e am: 37ba307e -s ours am: e72846f5 am: 6edd786e am: c421451c am: d3106013 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5fde76f5dda180148a656de844b0d7fcd787f7e0