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

[automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beac am: 67986815 am: 21bf183a -s ours am: f441c83b -s ours

am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 004e2f12 is already in history

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



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