[automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa -s ours am: 7874f3f7d4 -s ours am: a8dc385cff -s ours am: a859282288 -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 5c811c4df5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157297
Change-Id: I19309a1957686acac42fd4d3a61c879f506ebcbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: