Merge "Fix StationaryListener updating." into tm-dev am: 98d80bd7 am: 7591d920

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



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