Merge "Fix re-registering PositionUpdateListener" into tm-dev am: 92d87441 am: 3bed2ee0 am: bb281dc5 am: 702215f9

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



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