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

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



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