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 am: 0b01882f

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

Change-Id: Iaebfd79576e3469f584c3530287da254d5cb2e1c