Merge "Strip gerrit url trailing slash" am: 38280c6b55 am: 87b0546e4b am: d632660bac

Original change: https://android-review.googlesource.com/c/platform/development/+/1393363

Change-Id: Ib2b2aad76699226b54a0ea9b98dacdea1527363d