[automerger skipped] Merge "Add Settings for back animation developer option DO NOT MERGE" into tm-dev am: 0be85b0811
am: 4f14fd577d
am: 6408e8391b
am: 0aac285640
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17622557 Change-Id: Ibf3a67af0a62374b83ffb3532b52db444425df79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: