Totally sync with android16-qpr2-release Somehow there's still divergence after merged. Converging as long as it builds and looks harmless. BUG=b:478740843 TEST=bluetooth_AdapterQuickHealth.AVL.all_floss TEST=bluetooth_AdapterQuickHealth.AVL.all_floss.unstable_aflags Change-Id: Iefb8e42503ad7b1941e8364bccd94b119ab8eb8b Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/frameworks/proto_logging/+/7570310 Reviewed-by: Michael Sun <[email protected]> Commit-Queue: Hsin-chen Chuang <[email protected]> Tested-by: Hsin-chen Chuang <[email protected]>