Merge "Merge "Keep OEM defined DisplayAreaPolicy.Provider" into tm-dev am:...

Merge "Merge "Keep OEM defined DisplayAreaPolicy.Provider" into tm-dev am: bbecbbee am: e3113a0c" into tm-d1-dev-plus-aosp am: 993d844d

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



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