Merge "Merge "Update VTS tests to use GeranBands P900 and 850 instead" into rvc-dev am: dabaad71f7 am: 0a0d4f41d2 am: 4ad238583d" into rvc-qpr-dev-plus-aosp