[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: ab3728bf am: 2d9ccfdf -s ours

am skip reason: subject contains skip directive

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



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