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

Merge "Fix notification shelf issues" into tm-dev am: 11bfc967 am: a4d58a84 am: 5ea0a6bc am: b7c7666f

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



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