[automerger skipped] Merge "Add interface and extend db to support storing...

[automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2 am: 6cc261d7 -s ours am: e8c233c4 -s ours

am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da151 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394551

Change-Id: I4e6af4b49d9e9649a790f32a72ccb8b6d5d138c5