[automerger skipped] Merge "Bluetooth Metrics: Add metric_id field for...

[automerger skipped] Merge "Bluetooth Metrics: Add metric_id field for Bluetooth metrics to proto. The incremental id is neither a device id nor a pseudo name and therefore PII free." am: 9b575dcd am: 4b325da2 -s ours am: 20919552 -s ours

am skip reason: Change-Id I5393aee2d1940470678c3d00153a4771e5e676e1 with SHA-1 71c3a5d4 is in history

Change-Id: I92e3fcf8cfe30bf492cbbd29e34736f994f09eae