Merge "Rename shouldUseDefaultDisplayStateChangeTransition attribute" into sc-v2-dev am: ff265fecb9

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

Change-Id: I7938ee0138d46d9d9c587e1a4d2d386f39a5002f