Merge "Fix -Wenum-compare warning" into main am: be41969071 am: 369025da24

Original change: https://android-review.googlesource.com/c/platform/packages/services/BuiltInPrintService/+/3119355

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