Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71c am: ef748cfc am: 719b2f1f am: 507be6a4

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



Change-Id: I8ae9406ca1b8485a0d450d5abfe3a0b28b8f333c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>