Merge "Delay freezing for given duration through broadcast options" into...

Merge "Delay freezing for given duration through broadcast options" into udc-dev am: 66c81a3e am: 7c8a3a70 am: 00b80663

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



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