Merge "Hold a wake-lock for battery % changes in AOD" into sc-v2-dev