[automerger skipped] Merge "Add test for proxy spec building" am: 68dcdfa29b am: e723d84c16 am: 46c67f78b4 -s ours
am skip reason: Change-Id Ic1c8bf6e8f5e79a7a1736af6cc1d50a7969fb9ad with SHA-1 6fc985c39c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554103
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ffa508cef38127b20eff40758e63767e73f2aff
This commit is contained in: