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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33167ab926d43b8921a30e190bc44136fc0547d2