[automerger skipped] Merge "Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY" am: c845883448 am: 4a4b536059 am: fbc2bcad4a am: 3bcbb32014 -s ours
am skip reason: Merged-In Ie49f6274d8e780534e203d6d0a5ead4ed2f3cfa7 with SHA-1 f752c1925e is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200209
Change-Id: I5508c5bbae0c49c8038f25e306c53ed79ea3245b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: