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 am: 084ca022

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



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