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

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

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