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 am: 005505f1

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



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