Merge "[Settings] Prevent crash from abnormal behavior." into sc-dev am: 0279a99e43
am: 6627a79a69
am: 85147d949b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980880 Change-Id: Ic04adf98479d4e8627af8c4f25c37f329665f4f5
This commit is contained in: