Merge "Turn off the new back arrow in Teamfood." into tm-qpr-dev am: 4099b89e am: 4f5d526a

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



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