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

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

Change-Id: I51413b77287a7e505f3159917e3adf2e4bd03401