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

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

Change-Id: Ie867d1a26fe416e588a961313f8c6441ac7267e7
Signed-off-by: Automerger Merge Worker <[email protected]>