in GB requery() didn't throw exceptions (mostly). replicate that in HC
in GB requery() didn't throw exceptions (mostly). replicate that in HC

bug:3302851
Change-Id: I56e0bd178b200472cb1dbcbd2e80b844690b8964

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base