[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: d667d306 am: 26695c9e -s ours

am skip reason: Merged-In Icda4692e05396407d961610de0ce709492adadc1 with SHA-1 ab58191c is already in history

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



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