Merge cherrypicks of [19980643, 20100213] into sc-platform-release. am: bd185d758f

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

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