Merge "Rounded corner not align to right on land" into tm-dev am: d159f721 am: 35b297ca am: 629101c7 am: 01cf4971

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



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