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

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



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