Merge mainline-release 6664920 to master - DO NOT MERGE am: fcde0b1dc1

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

Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e
tree: fe22684912bbbe3aa01be9ebd2d6263aae11ae39
  1. stats/