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: 591763f4

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



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