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

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



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