[automerger skipped] Merge "Add the API setAvailableServices and some overlay satellite configs" into udc-qpr-dev am: 0d2a5dba7a am: 06e7dabb16 -s ours
am skip reason: Merged-In I737cb77937fc19c047ef04010c5ca9397bbc45a7 with SHA-1 4354799e59 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24084226
Change-Id: I13b0cf82c17fbf33561864f742695ab463259a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: