Merge "Rounded corner not align to right on land" into tm-dev am: d159f721 am: ce2aacfb am: c238347f am: b5f4ff76

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



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