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

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

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