[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-v2-dev am: ad3c6859 -s ours am: c157cd44 -s ours

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

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



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