Merge "Embed an sdkinfo proto in the test media apex" into rvc-dev am:...

Merge "Embed an sdkinfo proto in the test media apex" into rvc-dev am: 8edfea73 am: 2c0eccb3 am: 05ea6318 am: c3156068

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

Change-Id: I79ccd1e72062c9e45563140de5e25d23b392fe62