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

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



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