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

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

Change-Id: Ic22f6186f11e61ad5dc545735847332dc47a8055