Merge "Konst-ify test data gd/dumpsys/bundler/test.cc" am: e041c671 am:...

Merge "Konst-ify test data gd/dumpsys/bundler/test.cc" am: e041c671 am: f1236ed5 am: 62a0d403 am: e3a3be5e

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1858602

Change-Id: Ifef2c9ed09d33526c1a796e95f3284b8997fff95