am 1be040fb: am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master
am 1be040fb: am b15623cf: resolved conflicts for merge of 9483748a to stage-aosp-master

* commit '1be040fb7d849762bf31bf9f898a4a004015aeb1':
  Delete outdated options tests

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