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: 54749713

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



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