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

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

Change-Id: Ibe3f2ae861dae47224e4beb8d3de8bdd78032bf7