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

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



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