[automerger skipped] Merge "Fix converting 28-bit DAB radio id to AIDL HAL id"...

[automerger skipped] Merge "Fix converting 28-bit DAB radio id to AIDL HAL id" into udc-qpr-dev am: 504df8c4 am: c56d7512 -s ours

am skip reason: Merged-In I263a3a88c6b4259fa6b3b1d7489a63f4d079e6c0 with SHA-1 e7168a21 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24763252



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