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

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

Change-Id: I3c2c0a9d07afd94ba0e83b81e1a630e071c5052d