Merge "Replace RoundedCornerBitmap with outline clipping" into rvc-dev am: 5a7e06187d

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

Change-Id: I0c8ec576bf3ec6a43b86b58d0c25dff969004560