[automerger skipped] Merge "Use TagType constants" into sc-dev am: acce5d3c...

[automerger skipped] Merge "Use TagType constants" into sc-dev am: acce5d3c -s ours am: 0c90aa0a -s ours am: 6223074b -s ours

am skip reason: Merged-In Ie8af1f00d04fa05c59cfc72692caecbcf2fae483 with SHA-1 a5047720 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15232853

Change-Id: I498c8dfda62f63a2b3efbe14f861aabe0a0624fb