Snap for 8474198 from 43825176a2a4985bca3636d9741e1f2455859c8c to tm-release am: 1f7ae7b706

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

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