Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4
am: 300ebee8c4

Change-Id: I0ae48f45c0debbe2e875ab123491c09bea265c3e