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: 3a572269 am: a3720db5 am: e9de9a30

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

Change-Id: Iaaa6bdf7e1bb57b6b4efb83c6265a1887bba8cd6