Merge "Merge "Delay timer after changing voice preference" am: b569bd4953" into stage-aosp-master
am: 2853d7b57d

Change-Id: I9e70c6ff597582f0d066b665b4808eec1d6654b5
tree: c88f4726ea59db0cbb009593d8e08964e9223c2d
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. PREUPLOAD.cfg