Merge "Add test for proxy spec building" am: 68dcdfa29b am: e723d84c16

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554103

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f570a5527c14d8b031537270108b0db8e2eebbc