Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d82f

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

Change-Id: Ib1236e0f32527661d59cc2dafd0ebfce259bdc00