Fix deadlock b/w historical and discrete registry in xml implementation

This probably was introduced when offsetDiscreteHistory
was refactored in ag/32135499

Fix: 407883163
Fix: 409236197
Flag: EXEMPT bug fix
Test: all app ops test via abtd
Change-Id: I00c677c7f55dade2d229077c248d8798fc1e9d46