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