Merge "Merge "Update default desktop app density to 284" into udc-qpr-dev am:...

Merge "Merge "Update default desktop app density to 284" into udc-qpr-dev am: f312e919" into udc-qpr-dev-plus-aosp am: 7ecff36e

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



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