Merge "Fix SmsManager#testSmsBlocking flakiness" am: 3b6da19bdc
am: a98f5ed1b3

Change-Id: Id848d848f213ff5a327a9f3606f1400245a77e32