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: 5a86ebd9

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



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