Merge "Changed rounded rect paths from paths to rounded rects" into rvc-dev...

Merge "Changed rounded rect paths from paths to rounded rects" into rvc-dev am: b49472c6 am: c6c86d5e

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

Change-Id: I4b954e6b067f1478c82b1dc870f529cb3336cc2a