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