Merge "Merge "Update the split layout while density changed" into udc-dev am: c3662a31" into udc-dev-plus-aosp am: dc617294 am: 0614c23b

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



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