gps: maintain one solution am: ae8f93dfb9 am: 146cb6177f

Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky-sepolicy/+/24250047

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