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

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



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