[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: e081da37e6 -s ours am: 322d5b6440 -s ours am: c2f10b3c57 -s ours am: 5a2cd0066b -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: I2051c474bd6404c1f21133d31edf8b60b565a59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>