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 am: ec9df13f

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



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