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

Change-Id: Ib2f4c585628cb469975dbe41a85bfdcb52e58857