Merge "Fix new back arrow's "over eager" appearance" into tm-qpr-dev am: fab68663 am: 60fda563

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



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