Merge "AOD: Track missed AOD time ticks" into oc-dev am: e7b581bca9
am: 5ed5068b07

Change-Id: I61842088994ceb5137f4e773eca77991132590b4