[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: e038adf4 -s ours

am skip reason: subject contains skip directive

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



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