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

Change-Id: Ifa7706c66b781aebb8201cf1702f0e030aa27d61