Merge "Some cleanup logging and test for back navigation" into tm-dev am: a28e9899

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



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