Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 am: be8de58cf0 am: 1286675083

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

Change-Id: I50795bb895c98fe105ee4a891ab72a2d9776109d