Merge "No disclaimer when switching profile for system SMS and dialer apps." into pi-dev am: a7a496f3a1
am: 487ca863a0

Change-Id: I7d5a8a2e2784adc31ae0f366cf81650819228007