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

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



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