Merge "Merge "Use packageName instead of specific secondary launcher activity" into rvc-dev am: fb715c04 am: 20e89693 am: d38ffeb3" into rvc-qpr-dev-plus-aosp