[automerger skipped] Merge "Bluetooth Metric Id: Add metric id allocation to Bluetooth metric calls" am: 77e05faa am: 9779bce0 -s ours
am skip reason: Change-Id Ib3a231c004d6c967902b20c6f9d6e11f11421fad with SHA-1 9ec6e951 is in history
Change-Id: I645a10b902a1e0df1c77a83289d7a8101b653db3