Merge "Fix the comparison between opaque parameters" am: 1caa406e30 am: f3cd490aed

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

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