Merge "Increase vertical overlap between notification shelf and lock icon"...

Merge "Increase vertical overlap between notification shelf and lock icon" into tm-dev am: d2576a75 am: 1966e12c

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



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