DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 841ce92aa1 am: 91fd430a8d

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

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