Merge "Fix overlap between notifications and lock icon in portrait shade" into...

Merge "Fix overlap between notifications and lock icon in portrait shade" into udc-dev am: 674a19a2 am: 0e5592a2 am: 3cd0a451

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



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