Merge "Only apply rounded-corner animation on TYPE_BUILT_IN displays" into qt-dev
am: 3939be6195

Change-Id: I72360b2f6b0b0b44139e65320bd0b354bf3c2210