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