Merge "Add an API to update satellite listening timeout duration" into udc-dev am: 225c2e764e am: a19006fe90

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

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