[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-dev am: 9ad82d42 am: abb621ad -s ours am: 6ba64883 -s ours am: 0dac6b1b -s ours

am skip reason: Merged-In I698e9df0333cbb51dd9bd5917a94d81273a2784a with SHA-1 9a2686ae is already in history

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



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