[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: 2e07daf596 -s ours am: baa2d47b56 -s ours am: 270d9570c0 -s ours am: 11eff39103 -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: If044f0d586ff7f465c49c70b35c625f7638dd252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>