Merge "Fix ActivityRecord#attachCrossProfileAppsThumbnailAnimation issue" into rvc-dev am: dca10f7c72 am: 17990c3a91 am: 22caf4dcaa

Change-Id: I55227d6296d259b5d89b72645f9eb8ffcd60a5ff