Merge "Crash on device controls availability" into sc-qpr1-dev am: ba2546df4c am: 53949ff4c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15533188 Change-Id: I99bf4eb65ffdad20bccd2210608aa6f5e1904601
This commit is contained in: