Merge changes from topic "am-7be37ea9f2fe450e92024c007baaf9d4" into tm-d1-dev-plus-aosp
* changes:
Merge "DO NOT MERGE Only rely on developer option for back animation" into tm-dev am: 451dc8a3 am: 1d275796
DO NOT MERGE Only rely on developer option for back animation am: ab58191c am: 1d83999a