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: f5429dfc

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



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