Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" into rvc-dev am: 95ff60f2fd am: b1f86981c5

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

Change-Id: I523778a90fba7077f40dd5fd2025e2ff9f37e4b2