[automerger skipped] Merge "Set no data transfer on function switch timeout for accessory mode" into sc-qpr1-dev am: 1d5cac89a3 -s ours am: c1368ea9ef -s ours am: 9b98a360ec -s ours am: ea4656f6e9 -s ours am: 34fadb43c2 -s ours am: a45d0d8bf0 -s ours am: b712790f69 -s ours am: b9cbc94c28 -s ours

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

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

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