Merge "Merge "Increase size limit for pulled StatsEvent." into rvc-dev am: 4c21a3b7" into rvc-dev-plus-aosp am: efc58b4a

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

Change-Id: Ia78236fa3b1701ebef2bb4ccc147501dc03eb72f