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

Change-Id: Icb6e18a867302d85d877d9bf4a8d33836eac9539