[automerger skipped] Bluetooth device slice improvement am: 05f5b8e7c4
am: a1dad7246d
-s ours
am skip reason: Change-Id I47e9c47b2ab0adacdbdbde34522d7c0172adda75 with SHA-1 05f5b8e7c4
is in history
Change-Id: I501751f9a7c645da090086ebc94341fd0ea0a821
This commit is contained in: