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

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

Change-Id: I5e1b81be5320cffb3fe1a709abbe0346f6021733