Merge "Allow overlap between notifications and lock icon" into tm-dev am:...

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

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



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