Merge "Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3 am: 0fcadeae" into oc-dr1-dev-plus-aosp