Merge "Added a debug flag to turn on the AOD animation" into pi-dev
am: 8b418b00e3

Change-Id: I551587ccb0ff6aadb6a48d1dfd4280c854814603