[automerger skipped] Merge "[Settings] Avoid from crash" am: fdb57510 am:...

[automerger skipped] Merge "[Settings] Avoid from crash" am: fdb57510 am: 8ff7f44b -s ours am: fb943ee4 -s ours

am skip reason: Change-Id I4008010077c61930487fef01af306ccdfd69e38f with SHA-1 a9de4477 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1385026

Change-Id: I400c46b55aae14f6a16ea3c0e8119911e0d98c53