Merge "Merge "Update the split layout while density changed" into udc-dev am:...

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

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



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