Merge "Replace display area organizer upon registration" into udc-dev am: 561aeec1

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



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