Merge "Crash on device controls availability" into sc-qpr1-dev am: ba2546df4c am: 4e8e52f8f9

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

Change-Id: Id8827e5fd3903e66788c12ecae84e4cacc172885