[automerger skipped] Merge "Set no data transfer on function switch timeout for accessory mode" into sc-dev am: e3d46f4048 am: 1a2bdf2937 -s ours am: 9c4ba11177 -s ours am: 17b02447bf -s ours am: f1e0f997d6 -s ours am: df46c491cb -s ours am: f2358e6086 -s ours am: f5834979d2 -s ours

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

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

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