[automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to...

[automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beac -s ours am: 7874f3f7 -s ours am: a8dc385c -s ours

am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 5c811c4d is already in history

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



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