[automerger skipped] Merge "Remove IllegalArgumentException for registration of capabilities" am: e51d2698 am: b7b81db6 -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: I2f84af4d2d958b4f144ed5725ea5ebcccc1384d7