Merge "Adding protocol for chinese Id in ProtocolDiscoveryConfig AIDL" into main am: f5dcb1fe38 am: 20cbb3e57e

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

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