Merge "Do not use prefixOrderIndex for animation layer" into sc-v2-dev am: af715328d3 am: 2f7bdbc104

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

Change-Id: I16eb1a80291217f66ae318391cd7cbe6f08241fb