Change Regulatory Info Activity to prefer string over image

Change-Id: I9ea5c2bf469af8f654ec4e4bb4f2a8a5738e6a95
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0