[automerger skipped] Merge "Setting apex version to the placeholder value" am:...

[automerger skipped] Merge "Setting apex version to the placeholder value" am: 88e1320d am: df464b33 -s ours am: cb6d3eee -s ours am: aa08e7c6 -s ours

am skip reason: Merged-In I30b5b486bca521ebdeed17dba7afc61f2c529ab8 with SHA-1 8413ae85 is already in history

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



Change-Id: Ic594f9f747f3ebeada5741c88cd90fc92859b5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>