Merge "Fix notification shelf issues" into tm-dev am: 11bfc9677d am: a4d58a84f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17896364 Change-Id: I48054c17f562e169261332fdd26ac6e4e50547d6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: