Merge "Merge "Update the split layout while density changed" into udc-dev am: c3662a31" into udc-dev-plus-aosp am: 54ca5eea am: c317dcf8 am: 204a4af2

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



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