[automerger skipped] Merge "DO NOT MERGE Only rely on developer option for...

[automerger skipped] Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev am: 451dc8a3 am: 1e4d32b5 -s ours

am skip reason: subject contains skip directive

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



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