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

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



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