Merge "Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle" into nyc-mr1-dev
am: 33e56a9e1f

Change-Id: I74c2a5391f8eebf0544447886b14714fbd0202b1