Merge "Correct getExtras("satellites")" into udc-dev am: f9f553805d am: ce970134c3

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

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