Merge "Crash on device controls availability" into sc-qpr1-dev am: ba2546df am: 53949ff4 am: bdfa048b

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

Change-Id: I654cf3cc8322d45e6b5977db0f62b08063a0dd3e