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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12050369

Change-Id: I2d7f54863f807a260a3efd980820fe7d2bb5ff0c