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

Merge "Merge "Increase the max process count supported by BatteryStats" into udc-d1-dev am: 9763c6d1 am: ecf1a066" into udc-qpr-dev-plus-aosp am: 64228908

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



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