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

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

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