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

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

Change-Id: Icbd2c2df717ef969e730294e0f01421bb942cdba