[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: 1d275796 am: cbb5405f -s ours am: 38ad2a6c -s ours

am skip reason: subject contains skip directive

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



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