Merge "Fix "appearance glitch" in Back Arrow" into tm-qpr-dev am: bb691ff0 am: 6614ba30

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



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