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