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