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

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



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