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: 893b9075 am: abc82a9b

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



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