Merge "[automerger skipped] Merge "Update default value of probe url to be a...

Merge "[automerger skipped] Merge "Update default value of probe url to be a constant" into rvc-dev am: 19b2c8a1 am: d154f984 am: 40b0e2eb -s ours" into rvc-qpr-dev-plus-aosp am: 276e3abf -s ours

am skip reason: Change-Id I1846958e7c4e8b64ae287718c63e705bb232632a with SHA-1 5dbe6851 is in history

Change-Id: Ic409e8f2a9acf571f6ad560a7a7394dcfe2d224a