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

Merge "Increase fdtrack thresholds" into udc-dev am: e6eaf926 am: a6e2a150 am: cb5a5a6a am: fd018ea9

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



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