Merge "Resolve activity bounds with transformed display info" into rvc-dev am: d071b2526e am: a328d02862

Change-Id: Ieff5c439a16fc141bc920af0e1035e49798684d6