[automerger skipped] Merge "Remove IllegalArgumentException for registration...

[automerger skipped] Merge "Remove IllegalArgumentException for registration of capabilities" am: e51d2698 am: b7b81db6 -s ours am: d678eef5 -s ours am: 70016841 -s ours am: 96c6f3fb -s ours

am skip reason: Change-Id I3250419a2438afb58922ae653e3f2e4f9628e593 with SHA-1 ffb93e5d is in history

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

Change-Id: Id7244d38e90b5f499e0f90c06ea6fa51343d7527