[automerger skipped] Fix EDIPartyName parsing and GENERAL_NAME_cmp. am: ac675a6d20 -s ours

am skip reason: skip tag Change-Id I1fb4105341a73be9d5f978301f7318e16027f37d with SHA-1 17486117ac is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/boringssl/+/13918777

Change-Id: Ifea645b6f5465bc35eeb6c364c00ea99a0201245