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

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



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