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

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

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