Merge "Don't expand shade when pulsing w/o tracking notif" into tm-dev am: 1fe78c6a am: 01ce4caa

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

Change-Id: Ia0c8a01717f6446d34bb7a55dee8fe8098ce00c8