Merge changes from topic "am-ee3e0f6ff1904d5d8e2832831051b6b9"

* changes:
  [automerger skipped] Merge changes from topic "cherrypicker-L01300000960051069:N96900001359941510" into tm-qpr-dev-plus-aosp am: 7999a357 -s ours am: eb95697e -s ours am: 6e0b5b61 -s ours
  [automerger skipped] [automerge] Restrict maximum size of FontInterpolator font caches 2p: 39dbe900 am: 1046f245 -s ours am: d05204fb -s ours am: da06307a -s ours