Merge "Merge "Keep OEM defined DisplayAreaPolicy.Provider" into tm-dev am: bbecbbeeb0 am: e3113a0ccf am: 7c2c2000a0" into tm-qpr-dev-plus-aosp am: 5d9f2da328
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18869756 Change-Id: I73422c39b9b25cbe04177ecfe7b0c9078aacc033 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: