Merge "Fix the comparison of opaque types that have multiple definitions" am: 1d2edd2cd2

Original change: https://android-review.googlesource.com/c/platform/development/+/2252362

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