Merge "Fix always return first package for mock location app in developer...

Merge "Fix always return first package for mock location app in developer options." am: d2212698 am: 280ad76a am: 4c06c242

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2133170



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