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