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

Change-Id: I0dcf88e93350f2f19676fbab84313e6a4b768f18