Merge "[Settings] Avoid crash from rotation screen." am: 04e416d68c am: 095e4093b0

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

Change-Id: If245b0d5fd4eeb161effae1c4f26c9cab6ed9860