Merge "Revert "Do a version bump of media and media.swcodec apexes"" into...

Merge "Revert "Do a version bump of media and media.swcodec apexes"" into sc-dev am: 3e3b2182 am: 9c0bf900

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

Change-Id: I8664f73bac67263bc9d2f04eb3aa83f4b9feca38