Merge changes from topic "am-d83d0d6d54d848d4ac8f04156f0b62c9" into rvc-d1-dev-plus-aosp am: 3e0e7c6c18

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

Change-Id: Ic4f705ebb2d72af57d375615227e8aa5d785d700
tree: 66022c647ac30d7255aafc3c4340a23abe151a2e
  1. stats/