Merge "Set no data transfer on function switch timeout for accessory mode"...

Merge "Set no data transfer on function switch timeout for accessory mode" into tm-dev am: 9ad82d42

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



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