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

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

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