[automerger skipped] Merge "Add ProxyInfoTest to test public APIs" into rvc-dev am: df4747a13e am: da6b514147 -s ours
am skip reason: Change-Id I451989f7312fb98ec2fa0b7b9ddc856ecf2087be with SHA-1 b03df59c70 is in history
Change-Id: I55376bfabc292607870659799e3a7947ceefb294
This commit is contained in: