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

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



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