[automerger skipped] Merge "Add developer option for back animation DO NOT...

[automerger skipped] Merge "Add developer option for back animation DO NOT MERGE" into tm-dev am: 064b49a1 am: 5ee68b9d am: ce0fa1e4 am: 77bf1634 -s ours

am skip reason: subject contains skip directive

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



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