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

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



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