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: dc617294

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



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