Merge "Updates to new back indicator" into tm-qpr-dev am: 0e0bc674 am: 3d0fccd6

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



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