Merge "lint_fix: fix CLI arguments use" into main am: 29ba23d801 am: 7a3c7e8d65 am: 90948508a7

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758608

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