Correct trigger_uri if X-Forwarded-Proto is https

Closes-Bug: #1359516

Change-Id: I5e5ade4976b27806037f99da7a8d72ed7e16811e
Merge "Correct trigger_uri if X-Forwarded-Proto is https"