Merge "AudioFlinger: Change timeout for FdToString." am: d578bbd330 am: 0210818c13 am: a7805886d5 am: 2607485e82

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1490687

Change-Id: I5ab419436ea3732a889fe5bb24473614ed3a8d96