Merge changes from topic "uri-logic-sc-dev" into sc-qpr1-dev am: 9531dc43b0 am: 87f472aec2 am: aa9593d98b am: f5429dfc24 am: e3f6019cb1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21373610 Change-Id: I29f6e5233b9487dc53f27995acd452d908254c0a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: