[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make thresholds tuneable in...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make thresholds tuneable in the ddc" into sc-v2-dev am: 306d10be am: eed62bfd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id9a5604657b6a72e40661ac25a6291f334e5ef83