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

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

Change-Id: Iafeb5e1a7be0a5fc669a5728b9dd7495955370e9