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

Merge "Fix notification shelf issues" into tm-dev am: 11bfc967 am: a4d58a84 am: 49961a65 am: 86453e4c

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



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