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 am: 1467de15

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



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