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: I9854f207cd81785a572f1e967244b876acb1f226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>