Merge "Allow overlap between notifications and lock icon" into tm-dev am: 44286954 am: 7de9d66c

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



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