Merge "Temporarily disable AppClipsActivityTest due to flakiness." into udc-dev am: 985b2525 am: 97e31479

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



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