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

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

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



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