Merge "Fix overlap with smartspace and weather clock when changing display"...

Merge "Fix overlap with smartspace and weather clock when changing display" into udc-qpr-dev am: 971acc64

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



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