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

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



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