Merge "Merge "Add installerSource to packageSetting earlier" into rvc-dev am: 93b7187b am: 28648e14" into rvc-d1-dev-plus-aosp