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

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



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