[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 sc-dev am: e3d46f40 am: 1a2bdf29 -s ours am: 9c4ba111 -s ours

am skip reason: Merged-In I698e9df0333cbb51dd9bd5917a94d81273a2784a with SHA-1 643bea50 is already in history

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



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