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

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



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