Merge "Add ellipse shape to the ripple." into tm-qpr-dev am: 6ac6ce93

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



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