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

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



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