Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev am: 451dc8a3

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



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