Merge "Merge "Use packageName instead of specific secondary launcher activity" into rvc-dev am: fb715c04 am: 72c3ea0a am: ca544ce2" into rvc-qpr-dev-plus-aosp