Merge "Merge "Should forward the intent even if its activity is disabled in Settings" into nyc-dev am: de4b51c8ce
am: ce2201a04c" into nyc-mr1-dev-plus-aosp
am: 7d72db5f7d
* commit '7d72db5f7de69b2b5afec968a743e194855cdaad':
Change-Id: I75939e3d47fa5e137556c752253699ea6fd62955
This commit is contained in: