Merge "Add a reset mechanism into content protection processor" into...

Merge "Add a reset mechanism into content protection processor" into udc-qpr-dev am: 5e51aa6b am: 82480038

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



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