Merge "Add a flag for rounded box charging ripple." into tm-qpr-dev am: 30093d74 am: b370e127

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



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