Merge "Made minor refactoring and lint improvements." into main am: 38819e3974

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3265215

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