[automerger skipped] Merge "Use RadioConst to define undefined magic...

[automerger skipped] Merge "Use RadioConst to define undefined magic constants" into main am: a87df9ff am: 8be61770 -s ours

am skip reason: Merged-In I42314de8fe79a0d2b80430880e265b6f73bd5674 with SHA-1 4c8cadd1 is already in history

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



Change-Id: I04be35b2489e9feea5aef65cced9bf8f6c361843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>