Merge "media: Hide *_TRUSTED_CONTENT_ONLY constants" into main am: 0d5613696e am: 2cf3260664

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

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