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

Merge "Style fixes for mini resolver" into tm-dev am: 2f6f3aa7 am: 1a9ac652 am: 6a2e508a am: 53c038f8

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



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