Merge "Mark getInstallerPackageName @Nullable" am: c41a5d6bc0
am: cecccf6258

Change-Id: Ib27badf42d90932da0b7f2f0922b8903936feafd