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

Merge "Fix string comparison in otapreopt." into main am: ad357667 am: dfcb2791 am: a523ea01 am: 945391ba

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



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