[automerge] Fix that device isn't responding for a while when resetting all...

[automerge] Fix that device isn't responding for a while when resetting all settings on “Display size and text” page. 2p: 09a2a49b

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

Bug: 223747686
Bug: 220082104
Bug: 220070773
Change-Id: If66da507a1e49fa2abec0f4a36507cb73fb176b4