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

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



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