Add setting to disable assist data (2/2).

Bug: 20944446
Change-Id: I3c518176cab88ce9b5031a0241bee30240e6f896
5 files changed