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

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

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



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