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

am skip reason: subject contains skip directive

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



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