Merge "Add test to verify regulatory info launches properly" into oc-dev am: 4766183336
am: 2bb10c9e57

Change-Id: I9d58c7ee1154c640e570627477e97ffaeb68777f