[automerger skipped] Merge "Embed an sdkinfo proto in the test media apex" am:...

[automerger skipped] Merge "Embed an sdkinfo proto in the test media apex" am: a3809318 am: 5508d92e -s ours

am skip reason: Change-Id If98002f378c82d7d1d1454b40b285c3a4f3ed959 with SHA-1 9ff91b4e is in history

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

Change-Id: Ic6de9a7867bf2502a9db67c6d2146966d45737b2