Merge "Merge "Increase fdtrack thresholds" into udc-dev am: e6eaf926 am:...

Merge "Merge "Increase fdtrack thresholds" into udc-dev am: e6eaf926 am: a6e2a150 am: c0634359" into udc-qpr-dev-plus-aosp am: c28ecedf

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



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