Merge "Fix framework crash" into sc-qpr1-dev am: ad28fe0efb am: 6bbc661b4e am: 5e042e6241
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748726 Change-Id: I29d5375d17e2fe4a8274af41e10d03a6fded3244
This commit is contained in: