Merge "Update the split layout while density changed" into udc-dev am: c3662a31 am: 415ca03d

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



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