[automerger skipped] Merge "Fix AudioDeviceInfo.TYPE_DOCK device mapping" into...

[automerger skipped] Merge "Fix AudioDeviceInfo.TYPE_DOCK device mapping" into tm-qpr-dev am: aa820945 am: c9cf6884 -s ours

am skip reason: Merged-In I160875e74b29739a0232d6a7b833c3927433e067 with SHA-1 ea4bfc16 is already in history

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



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