DO NOT MERGE Ignore - Sanitized uri scheme by removing scheme delimiter am: 557941ca0c am: 8ddcba34c5

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

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