Fix the resource IDs used by CTS tests

* Google didn't make networkAttributes a public resource, so everyone
  is failing CTS after adding new resources to the framework. This
  fixes it.
* Same thing with config_useFixedVolume

Change-Id: I720b36d0922b636fe30f691f016add6b8cc7ade3
MiniThumbFile: Fix image/bitmap retrieval

Change I66005dd69b0a5c8f4353bd7a8225d163a654fd2d changed the insertion
and creation indexing mechanism, but the retrieval method was still
using the old sparse one. Fixit

Fixes android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithBitmap,
android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath,
android.provider.cts.MediaStore_Images_ThumbnailsTest#testQueryExternalMiniThumbnails,
and android.provider.cts.MediaStore_Video_ThumbnailsTest#testGetThumbnail

Change-Id: I41feea79fa304635f3908055fb95a8c85718a97f
Merge remote-tracking branch 'cm/cm-11.0' into wszf