Merge "Update package for app clips activity." into udc-dev am: de6e82488a am: 98f78a940a

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

Change-Id: I041affa8c148842b1b4e7bbc212edbd7b2ab22d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>