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: 889b6c20 am: 53ff556a am: 8928f986

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



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