Merge "Update satellite APIs from feedback" into udc-dev am: 26fbcfb9

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



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