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

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



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