Merge "Change default for NR advanced ratcheting config" into udc-qpr-dev am: c6d3bf6a7f am: d9c52c95aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24627525

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