[automerger skipped] DO NOT MERGE Prevent back navigation not working after...

[automerger skipped] DO NOT MERGE Prevent back navigation not working after activity re-created am: 338e9560 am: 029a3de2 -s ours

am skip reason: subject contains skip directive

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



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