Merge "Merge "Bump Test Apex version code to 2147483647" into rvc-dev am: 5bf36c5986 am: b8c993b768" into rvc-d1-dev-plus-aosp am: 16ff2ced31

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

Change-Id: I34b55ad00e0b6a13394bac60983be97bff1b2d25