Merge "Update ActivityMonitor.onMatchIntent to ActivityMonitor.onStartActivity." into oc-dev am: f64c5236c7

am: e3961b402a

Change-Id: Iaa78ed7a3883b2d89f736d4c88c1f755906ebb28

tests/app/src/com/android/settings/EncryptionInterstitialTest.java

@@ -93,7 +93,7 @@ public class EncryptionInterstitialTest {
         Intent mMatchedIntent = null;
 
         @Override
-        public ActivityResult onMatchIntent(Intent intent) {
+        public ActivityResult onStartActivity(Intent intent) {
             if ("test.unlock.intent".equals(intent.getAction())) {
                 mMatchedIntent = intent;
                 return new ActivityResult(Activity.RESULT_OK, null);