am b5d6adee: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" into stage-aosp-master

* commit 'b5d6adee6cea478c805d651718cca0fb5a72c4ce':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests