Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d8 am: 53f1a99f

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

Change-Id: I504497cf351c0fa556f930f0f2f59ee562829a92