Do not merge.

Hide the content provider and enforce the calling identity.

Bug: 3215801
Change-Id: Id72ee810a32e10e469f4dd64b8c3644e35a9247f
2 files changed