Merge "Update UsageStatsDatabase#KEEP_BACKUP_DIR." into rvc-dev am: cd2b3bab am: ac0dd9d3 am: 9aa9c580 Change-Id: Ic3702af538b47a381343d83ea6ac2d974bc6df38