Merge "Keep OEM defined DisplayAreaPolicy.Provider" into tm-dev am: bbecbbeeb0 am: ab900e7f03 am: ae1657e666 am: 39cf88932a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869756 Change-Id: I8d04aaee4aab261932361d2b9bd401c3620a857e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: