Merge "Merge "Increase configs per uid limit to 20" into rvc-dev am:...

Merge "Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e6 am: ea74ace5 am: 032062ba" into rvc-qpr-dev-plus-aosp am: 6af313a2

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

Change-Id: I211a6d6a8ff7dd2be8b3ae7f2e747c288b9ca20d