[automerger skipped] Merge "Add the android:clipToOutline attribute for views." into sc-dev am: d6a8f14a -s ours

am skip reason: Change-Id Ieeb6b790ea6765e4545c0fd746d37d420d427041 with SHA-1 888481fd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4991eb2bfe0bafe763f673a5550dc107adbd5ecf