Merge "Fix string comparison in otapreopt." into main am: ad357667e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2736396

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