Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0 am: c3143fb334
Change-Id: I307706f75aaf5fb6ae332b38b7faa0f96d2c2cf9
This commit is contained in: