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

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

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