[automerger skipped] Merge "Keep "Resetting your internet" when screen...

[automerger skipped] Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev am: dc4b54c1 am: 1793a5a3 -s ours

am skip reason: Merged-In Iae9585ff8366b8b71b4c39dc0ec7e87a0320fa5a with SHA-1 728a5919 is already in history

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



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