Merge "[RRS] Avoid the resolution switch too rapidly." into tm-d1-dev am: d5279ceae3

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

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