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

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



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