Merge "Increase the max process count supported by BatteryStats" into...

Merge "Increase the max process count supported by BatteryStats" into udc-d1-dev am: 9763c6d1 am: ea3d940c

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



Change-Id: I36f3af4bd2cdbc618bcf70ea755f2f6ec6567d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>