Merge "Fix logging crash in ResolverRankerService model" into tm-dev am: ad237705 am: bde21c1b am: 488b3f99 am: 4409bd79

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



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