Merge "Changing cbor-java to static_libs" am: af82482295 am: 93c7b85f7b am: ec863c9b75

Original change: https://android-review.googlesource.com/c/platform/packages/apps/RemoteProvisioner/+/1683648

Change-Id: I4c8c9295a845fd1aad270b1651a9e778fa007072