Clean up some of the Content Provider code.

This is just a simple clean up of some of the existing Content Provider
code with minor changes to the overall logic. Some small optimizations,
mostly no-op change.

Bug: 156262145
Test: atest ContentProviderTest [all]
Change-Id: I65974f9012376c6f7f036f6a282cc51834553c7b
2 files changed