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

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

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