Merge "Delay showing the controls ui after dialog" into tm-qpr-dev am:...

Merge "Delay showing the controls ui after dialog" into tm-qpr-dev am: fe532fc2 am: 8e3b8b0e am: c876e5ea am: 04750e2d

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



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