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

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

Change-Id: I23a5d2234f87a69dc0ee54d1710b155c05922fa1