Merge "Merge "Merge "Delay timer after changing voice preference" am: b569bd4953" into stage-aosp-master am: 2853d7b57d" into pi-dev-plus-aosp
am: 7725ef0677

Change-Id: I6162615bfa6afbf3b81a9714ccd79deaf127b289
tree: 9ee0bab6e765de738e82b8fb269a2f84df03c90f
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. OWNERS
  6. PREUPLOAD.cfg