Merge "Fix that device isn't responding for a while when resetting all...

Merge "Fix that device isn't responding for a while when resetting all settings on “Display size and text” page." into tm-dev am: 8bd66478

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



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