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