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

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



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