Merge changes from topic "am-c7c1003483a74988b1bd48a340cd06ff"

* changes:
  Merge changes from topic "am-468cea9b039c4e73b38044a2424a425a" into android12L-tests-dev am: aac335af08
  [automerger skipped] Merge "liblog: use unique log tags for is_loggable tests" into android11-tests-dev am: 47bcb9a647 -s ours am: 3ff0b1b643 -s ours am: 797bd92ef4 -s ours