Merge "Fix issue #18671917: CTS:android.content.cts.IntentTests fails with LMP-MR1 release" into lmp-mr1-dev