Merge "Inherit packageName/windowAnimations on TaskSnapshotSurface" into pi-dev am: aec427ba1b
am: 076ed49046

Change-Id: I9478306c6ac579468f77a5f07658ec0db72a425f