[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-qpr1-dev am: 1d5cac89 -s ours am: c1368ea9 -s ours

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

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



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