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

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



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