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

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

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