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

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



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