Merge "OMADM intent sent by both system and apps." into nyc-dev am: 65ca16ebab
am: 4e36794b49
* commit '4e36794b49943d01eefa39443d7225f7b8c7a448':
Change-Id: I58e2e339071beb15d7edf0b497e6056aee9950ef
This commit is contained in: