Merge "DO NOT MERGE Prevent back navigation not working after activity...

Merge "DO NOT MERGE Prevent back navigation not working after activity re-created" into tm-qpr-dev am: c694f8b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21166958



Change-Id: I6df8718b41231a94daf6c11deeadc04925237875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>