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 am: d1029dc0

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

Change-Id: Id65e23a855c6ee4743cc345d6426c0ace4a6272a