Merge "DO NOT MERGE New Back Arrow in production" into tm-qpr-dev am: 225ce14f0e

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

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