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

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

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



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