Merge cherrypicks of [20214088] into tm-qpr1-release.

Change-Id: I5b8fca5589d3eee53547667040efd17003eaad70

Author: Android Build Coastguard Worker

packages/SystemUI/src/com/android/systemui/statusbar/notification/InstantAppNotifier.java

@@ -289,7 +289,7 @@ private void postInstantAppNotif(
                             .setComponent(aiaComponent)
                             .setAction(Intent.ACTION_VIEW)
                             .addCategory(Intent.CATEGORY_BROWSABLE)
-                            .addCategory("unique:" + System.currentTimeMillis())
+                            .setIdentifier("unique:" + System.currentTimeMillis())
                             .putExtra(Intent.EXTRA_PACKAGE_NAME, appInfo.packageName)
                             .putExtra(
                                     Intent.EXTRA_VERSION_CODE,