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

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



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