Merge "Update when display change callback on legacy transition" into...

Merge "Update when display change callback on legacy transition" into tm-qpr-dev am: c2df8dda am: 459a6437

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



Change-Id: I155b58a8ea19f74055a96b9779207368d6b720b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>