Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3
am: 3ca1b39596
am: 579bdff443
am: 742e5af8f9
Change-Id: I47e600f05804318c7b72f3761272c7c304400751
This commit is contained in: