Merge "Override DreamActivity enter and exit animations" into rvc-dev am: 1255a2d20b am: ca823fb574

Change-Id: I19e4f72ce00e6273b8ba605af49b687cf88a5a96