Merge "Increase vertical overlap between notification shelf and lock icon" into tm-dev am: d2576a75 am: 5a86ebd9 am: a419ca73 am: 2b7b32a9

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



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