Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 5cb5f175e0

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

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