Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03

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

Change-Id: I5cd61dd963ab57273ce6ee457c02bd6e10383f1c
tree: 8e1c8c094eafc9e95ba3a0102f84144cb05c7b75
  1. stats/