Merge "Merge "Fix re-registering PositionUpdateListener" into tm-dev am: 92d87441 am: 3bed2ee0" into tm-d1-dev-plus-aosp am: 3b803aab

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



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