Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" into stage-aosp-master