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