[automerger skipped] Merge "Add flag to control the throttle duration" into...

[automerger skipped] Merge "Add flag to control the throttle duration" into udc-dev am: a046c37a am: 98d7bc9a -s ours

am skip reason: Merged-In I0b7a123cf3e986127d3e26d4f2441590bccba79f with SHA-1 17d232d8 is already in history

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



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