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 sc-dev am: e3d46f40

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



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