Merge "Ambient Display: Delay charging indicator if about to wake up" into oc-mr1-dev am: e45c956f69
am: f5c9bd16af

Change-Id: Id5ca4ac29e48b36f4dd1183a69b95b6146805569