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

[automerger skipped] Merge "DO NOT MERGE Prevent back navigation not working after activity re-created" into tm-qpr-dev am: c694f8b4 am: 751d1076 -s ours

am skip reason: subject contains skip directive

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



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