Merge "Merge "Increase vertical overlap between notification shelf and lock icon" into tm-dev am: d2576a75 am: 9be72792" into tm-d1-dev-plus-aosp am: f34bfa7d

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



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