Merge "Fix Data Saver page crashed when rotate" into udc-dev am: bf9ba71cba am: 0f915a4c35 am: 55ee4d3d9b am: 21835b0e83

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

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