Merge changes from topic "uri-logic-sc-dev" into sc-qpr1-dev am: 9531dc43...

Merge changes from topic "uri-logic-sc-dev" into sc-qpr1-dev am: 9531dc43 am: 87f472ae am: aa9593d9

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



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