Fix issue #32125907: Intent.replaceUnsafeExtras() corrupts original bundle
am: 851ec49de7

Change-Id: I8a5f8e28f8e4ca7e8fd20abacc0da1dae4055da7