Merge "Don't set timeout when showing CDM UI" into rvc-qpr-dev am: f9fbdb6905 am: e618d32b07

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

Change-Id: I37e15a02a9becb56a793fe519c6b5e10b69524e9