[automerger skipped] Merge "Set no data transfer on function switch timeout...

[automerger skipped] Merge "Set no data transfer on function switch timeout for accessory mode" into tm-qpr-dev am: 40a6ac49 -s ours am: 477d838a -s ours am: e318f0b5 -s ours

am skip reason: Merged-In I698e9df0333cbb51dd9bd5917a94d81273a2784a with SHA-1 37be5d18 is already in history

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



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