Merge "Fix bug unregistering stationary listener" into sc-qpr1-dev am: eeff412d

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

Change-Id: I86a1e8f6222a2166906cd161f1c8aaca757c8a22