Merge "Increase fdtrack thresholds" into udc-dev am: e6eaf926 am: 972cb624 am: 06cb8198

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



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