Merge "Introduce a flag for new back affordance" into tm-qpr-dev am: 593ac556 am: 90c84421

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



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