am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev
am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev

* commit 'e2f4ab930fa4526cf989624356051b99008c23a6':
  Default "pickup peforms proximity check" to false.

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