Merge Android R

Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
tree: c5e951c348bb6c1ee421f6f4968e5878bfb740b9
  1. stats/