[automerger skipped] Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c
am: 095e4093b0
am: 80aafc5629
-s ours
am skip reason: Merged-In Ie25b2ab4284d47abdd5db23676d05b6d547b2a73 with SHA-1 e53d70babc
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916818
Change-Id: I4f6270d4d2d79fec98b31a11d68cd8b230885c22
This commit is contained in: