Merge "DrmRemotelyProvisionedComponent: assemble csr in adaptor" into main am: 134360bdb2 am: 974b5f1856 am: c089c2d2fd am: 3f736c3282 am: 92658031cc am: 5a27e1874a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2652389

Change-Id: I2c0ed469ac28cbf1729bed4c899340bb9a249b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>