[automerger skipped] Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev am: 451dc8a3d3 am: 1d27579684 am: cbb5405f64 -s ours
am skip reason: Merged-In Icda4692e05396407d961610de0ce709492adadc1 with SHA-1 ab58191c7f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: I1c70c2f7e22155455a216f43e735528acf6621e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: