Merge "Specify the task affinity for ToneDialog"
am: 7bd1850ed7

Change-Id: I1d1b9ac3f626ba5bf56d2b6d591be9ce36a7c566