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

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



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