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

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



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