Merge "Increase vertical overlap between notification shelf and lock icon" into tm-dev am: d2576a75 am: 5a86ebd9 am: 804b1851 am: 5a2da2e3

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



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