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

Change-Id: Ic097998a5fdbe47831934baf0f8bdebcfd622007