aml_res_331114000 (9323948,com.google.android.resolv)
Merge cherrypicks of [19771870, 19771871] into sparse-8909939-L64200000956179601.

Change-Id: I1724136ef46547c53ab98c75900bbb4743d8e1ca
tree: 7247885dfc5d8c010afd881b0c47c51f6eec5a1b
  1. stats/
  2. OWNERS