Merge changes from topic "am-6bfc0d61ca0045059a96869e339babea"

* 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: dbda0dfd -s ours
  [automerger skipped] [automerge] Restrict maximum size of FontInterpolator font caches 2p: 39dbe900 am: 1046f245 -s ours am: d05204fb -s ours am: d7774944 -s ours