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 am: 5909e463

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



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