Merge "Add content capture/protection units to presubmit" into udc-qpr-dev am: c4933d8f

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



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