Merge "Keep rounded corners during activity transitions" into tm-qpr-dev am: bce91b77

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



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