Merge "Don't make Settings' content providers no release." into pi-dev
am: c93ab691d3

Change-Id: Ifabcb4890086da8ac7ef4cd4d4cc3cf530750a43