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

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



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