Merge "Check if the display ids match when moving to top" into udc-qpr-dev am: 8d993275d1 am: 9c1784dc3d

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

Change-Id: I086b02c81d8797d9126733818b3c474deef72937
Signed-off-by: Automerger Merge Worker <[email protected]>