Merge "Fix notification shelf issues" into tm-dev am: 11bfc967 am:...

Merge "Fix notification shelf issues" into tm-dev am: 11bfc967 am: 2a6eebf9 am: 17522426 am: 20a21075

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



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