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

Merge "Increase configs per uid limit to 20" into rvc-dev am: d4d283e6 am: 36315621 am: a0f8d399

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

Change-Id: Ia88d58f4d1f40fc656a2d67081aba1564d5883f3