Merge "Fix settings crash" into rvc-qpr-dev am: 19af143fe7
am: cdf6fb31f0
am: b116a4d253
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523486 Change-Id: I4265146ddc98f5652e987ec88730083d86aef559
This commit is contained in: