[automerger skipped] Merge "Set no data transfer on function switch timeout for accessory mode" into tm-dev am: 9ad82d428b am: 2248d1d115 -s ours am: 5452964305 -s ours am: 2d1bd4e920 -s ours am: 7b55f7e56a -s ours

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

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

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