Merge "Support App Clips for WP user." into udc-dev am: 4d93facc am: 0a9bcf72

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



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