[automerger skipped] Merge "Update satellite APIs from feedback" into udc-dev...

[automerger skipped] Merge "Update satellite APIs from feedback" into udc-dev am: 26fbcfb9 am: 728d9d34 -s ours

am skip reason: Merged-In Id1eb6580ea365fbba188c44237e06e6e7ca7ba9d with SHA-1 bdfcbbb3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21951583



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