Merge "Merge "Add onUdfpsLocationChanged callback" into tm-dev am: f637bd54...

Merge "Merge "Add onUdfpsLocationChanged callback" into tm-dev am: f637bd54 am: f2d322ef" into tm-d1-dev-plus-aosp am: 4b330caa am: 67fbe317

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



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