[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: 3a6daba9 am: 6062c9fc am: 7bcb0736 -s ours

am skip reason: subject contains skip directive

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



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