Merge "Style fixes for mini resolver" into tm-dev am: 2f6f3aa7 am:...

Merge "Style fixes for mini resolver" into tm-dev am: 2f6f3aa7 am: dd06c94d am: 57bd1926 am: 640242a1

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



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