Merge "Clean up the strings and use f-strings instead of string.format()." am:...

Merge "Clean up the strings and use f-strings instead of string.format()." am: 4e824bc8 am: 757ba511

Original change: https://android-review.googlesource.com/c/platform/build/+/2491846



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