Merge "Merge "Another intent sent by both system and apps." into nyc-dev am:...
Merge "Merge "Another intent sent by both system and apps." into nyc-dev am: 71619aa4 am: 68846515" into nyc-mr1-dev-plus-aosp
am: a88c3e47
* commit 'a88c3e47':
Change-Id: I3d2b1162217b4dd9fd0399bdf82e653d372eb511