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

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



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