Merge "Uri: check authority and scheme as part of determining URI path" into sc-qpr1-dev am: fa9fe6fcdf am: 66ebfd2d7c am: 1d592864e9 am: fa172a3f84 am: ba6fffe23e

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

Change-Id: Ib567703257cf4eba2a23d1b2cb7c5bf5bb919cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>