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

[automerger skipped] Merge "Use TagType constants" into sc-dev am: acce5d3c am: 8ef49ec1 -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: I0c20cab74197ea1cf86e787125ecece6c75eb2ed