Propagate intent extras and finish activity properly

Bug: 131861430

Test: Builds
Change-Id: I7e831f74f1e55026b9343a4c4f47c9f5adc316e6
1 file changed