Merge "Merge "Add null check after getApplicationInfo in InstantAppNotifier" am: 56d6691e am: f5d40d9a am: 76665a64"