Bug: 63927552 Bug: 68703204 Test: atest DexLoggerIntegrationTests Change-Id: Ib61cf433ef4729c4e4a0539682b5ddbefdb65575